cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,890 Commits 6 Branches 0 Tags
810de4ddaa57a2b51a302037382e34c8eb80362a
Commit Graph

6769 Commits

Author SHA1 Message Date
Furlucis
4340e4a6b5 Talisman icon fix 
Makes talismans keep looking like talismans for more than a tick.
 2014-01-10 17:09:01 -05:00
Ccomp5950
bc6561b9e4 Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes. 
Who does that?  People that cause runtimes, that's who!

(Jerks)
 2014-01-10 15:59:40 -06:00
DJSnapshot
4219b597b6 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/customitems/item_defines.dm
 2014-01-10 13:52:07 -08:00
Mloc
6f01e97161 Merge pull request #4248 from Zuhayr/dev 
Dionaea changes (microwave recipe, holder procs) and resist verb.
 2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f Merge pull request #4244 from LightningIron/master 
Ninja bugfixes/minor code cleaning/energy cost changes
 2014-01-10 13:42:42 -08:00
DJSnapshot
46c6145cf7 Made it so asay is not the same color as adminlogs. 2014-01-10 13:39:40 -08:00
DJSnapshot
f911f84bbd Replaces modwho and adminwho with staffwho. 
(Also, stealthfix.)
 2014-01-10 12:49:32 -08:00
Mloc-Argent
4c1e17649e Merge remote-tracking branch 'upstream/master' into dev 2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Zuhayr
5cddea72f0 Colour fix for bread slices. 2014-01-11 02:50:49 +10:30
Zuhayr
212eed7e1c Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food. 2014-01-11 02:47:12 +10:30
Zuhayr
16a28b7338 Added filling_color var to food items for use in sandwiches. 2014-01-11 02:35:10 +10:30
Zuhayr
38f47f5ae1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
Ccomp5950
2b57605738 Merge pull request #4253 from SkyMarshal/mining 
Fix for mining.
 2014-01-09 17:22:12 -08:00
SkyMarshal
8885ad630e Fix for mining. 
Fixes #4249
 2014-01-09 17:26:13 -07:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
Zuhayr
906768070f Resolved custom_items.dmi. 2014-01-10 04:15:21 +10:30
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
LightningIron
8c26c23157 Merge remote-tracking branch 'upstream/master' 2014-01-09 11:15:26 -06:00
Zuhayr
d3d6294ab0 Compile fix, ugh. 2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286 Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob. 2014-01-10 01:58:22 +10:30
Zuhayr
f23bb5e1fd Roasted diona, for ZomgPonies/Paradise. 2014-01-10 00:26:23 +10:30
Zuhayr
35d8219bb6 Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine. 2014-01-09 23:57:20 +10:30
Zuhayr
f51c44cee9 Typo and compile fix. 2014-01-09 23:56:14 +10:30
Zuhayr
943554242a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-09 23:53:34 +10:30
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
ZomgPonies
09c56a0930 BS12 compile fixes for Constructs 2014-01-09 04:49:16 -05:00
ZomgPonies
7829c13c36 Typo compile fix 2014-01-09 04:46:27 -05:00
ZomgPonies
b4f401e3b6 Constructs missing all their abilities -- Taken from /tg/ 
Desc of constructs and cult mode promises certain abilities to various
constructs that were missing. Also fixes some typos.
 2014-01-09 04:40:37 -05:00
SkyMarshal
f79ffa598e Tradeband and Gutterspeak now have a different font than Tradeband. 
Fixes #4143
 2014-01-08 22:15:47 -07:00
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
LightningIron
756214fbc7 Reverted lockbox removal which was on my master branch. Should be merged with next dev. 2014-01-08 21:13:55 -06:00
LightningIron
8ae2266526 Added captured variable to mobs, non-chair equivalent to being buckled into a chair 2014-01-08 20:49:45 -06:00
Zuhayr
1f779a010b Merge pull request #4241 from Faerdan/dev 
Minor fix for NanoUI
 2014-01-08 17:49:22 -08:00
Chinsky
3259ccf86f Merge pull request #4217 from DJSnapshot/dev 
Custom stuffs!
 2014-01-08 17:22:29 -08:00
Mark Aherne (Faerdan)
8e041670e7 Minor fix for NanoUI 
* I was passing src instead of src_object in try_update_ui, this is fixed now.
* Changed checks to use the isnul procl, just to be sure.
 2014-01-09 01:06:24 +00:00
Bobylein
91fa949c3a Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot. 
Conflicts:
	code/modules/clothing/suits/labcoat.dm
 2014-01-08 19:35:34 +00:00
rymd
5f6a3a01a9 Fixed destructive analyzer failure messages. 2014-01-08 19:27:27 +00:00
Giacomand
dfdeed7434 Made the follow verb less buggy. 
Removed duplicated code.
 2014-01-08 19:14:15 +00:00
Aranclanos
96cf1b050d Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell. 
Conflicts:
	code/WorkInProgress/buildmode.dm
 2014-01-08 19:13:57 +00:00
Mark Aherne (Faerdan)
b9335e8855 NanoUI fix. 
* Moved the receiveUpdateData JavaScript into the head so that it's loaded first.

This is to prevent an error which occurs if an update is recieved from the server before the UI is fully loaded.
 2014-01-08 12:42:20 +00:00
Mloc
794be2b31e Fix previous commit for BS12. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-08 11:49:15 +00:00
YotaXP
68ae21fac3 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm
 2014-01-08 11:41:51 +00:00
Mloc
0c48d1b102 Merge pull request #4233 from Zuhayr/dev 
Commit testing? What's that? Single character fix for pulse checking.
 2014-01-08 02:37:42 -08:00
Zuhayr
a040cb8f08 Commit testing? What's that? Single character fix for pulse checking. 2014-01-08 21:07:10 +10:30
Ccomp5950
3df123db38 Merge pull request #4225 from Zuhayr/dev 
Mixed up some whitelist flags, also added alien reagent reactions.
 2014-01-07 20:12:03 -08:00