cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,389 Commits 10 Branches 0 Tags
1a48a2b6b0222fcfee10fc5ed7eb865e6711d6b2
Commit Graph

1033 Commits

Author SHA1 Message Date
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Segrain
9eee328d34 Verb categories. 2013-09-19 08:30:05 +03:00
SkyMarshal
1f634873ea Merge pull request #20 from SkyMarshal/patch-3 
Fixes EFTPOS units failing to connect to account DB.
 2013-09-13 21:14:31 -07:00
SkyMarshal
7d81b02dbe Fixes EFTPOS units failing to connect to account DB. 2013-09-13 21:13:43 -07:00
SkyMarshal
7b1974e4b5 Prevents the accounts database from automatically being removed from machines. 2013-09-13 21:12:49 -07:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Kilakk
6d2cd82a14 Added a fax machine to send messages to centcom with. 
* Formatting can be seen by admins
* HTML tags can be used in replies
* Replies are sent directly to the fax machine and have a fancy stamp on them
* Currently uses access_lawyer but this might change
 2013-08-18 14:39:08 -04:00
Erthilo
9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
Zuhayr
f2fdbc6c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-07 21:30:45 -07:00
Segrain
858d6d8131 Tape is not a lattice. 2013-08-07 02:56:21 +03:00
comma
e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Zuhayr
a8c04cefc6 Merge. 2013-08-03 09:14:20 -07:00
Erthilo
d591c1ef75 Hotfix for EFTPOS and ATM machines not connecting to databases. 2013-07-30 20:26:08 +01:00
Zuhayr
a3ad055216 Merge pull request #3372 from Segrain/dev 
Cameras update.
 2013-07-27 15:42:04 -07:00
Zuhayr
012401b380 Merge pull request #3371 from Kilakk/dev 
Fixes #3368 - Removed the (empty) medkits from ERT backpacks
 2013-07-27 15:40:47 -07:00
Kilakk
b75d45814a Removed the (empty) medkits from ERT backpacks 2013-07-27 16:05:55 -04:00
Segrain
0a30fe8ce2 Conflict fix. Again. 2013-07-27 21:51:38 +03:00
Zuhayr
b0d8ee7861 Merge resolution. 2013-07-26 23:17:48 -07:00
Kilakk
839d50d18e Fixed a few small issues with admin-ERT 
* ERTs will no longer show up as "unknown" in the traitor panel, deadchat, and at the end of the round, among other places.
* Added update_icons() -> You no longer need to trigger it manually by clicking something
 2013-07-25 00:03:54 -04:00
Mloc-Argent
eaf4b7cf49 Absoloutely massive (1 character) fix for virology. Pathogenic incubator radiation now goes down as intended. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-23 19:48:56 +01:00
Kilakk
1ba49d17cb Made it so auto- and admin-ERT crosscheck each other 
This avoids having an admin call an ERT and then having the auto call
a second ERT on its own

Also added a check to abort ERT if not enough people sign up (members_required is currently 1)
 2013-07-22 16:53:48 -04:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Cael_Aislinn
e4b4486768 added a spawning guide to EFTPOS devices 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:38 +10:00
Cael_Aislinn
4421bede17 moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:06 +10:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
SkyMarshal
efd3d83e78 Reverts my firechanges, also air alarms now have a temperature regulation capacity. 2013-07-04 20:55:59 -07:00
Spamcat
11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops 
Conflicts:
	code/game/gamemodes/objective.dm
 2013-07-01 19:49:29 +04:00
Spamcat
10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
comma
50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
Zuhayr
a877a2a9a8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-25 23:55:01 -07:00
Zuhayr
b3ba567099 Fixes #3145 2013-06-24 21:31:38 -07:00
meyar
6f84917a58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-23 00:17:13 -04:00
SkyMarshal
9591c3773e Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up. 
beach.dmm is now unescapable.
Fixes #3114
 2013-06-21 20:14:11 -07:00
Jim Apples
3ce6514073 Re-enables....something... 
huhuhuhu

Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-21 20:15:14 +01:00
Zuhayr
c451f927fc Using BEF map. 2013-06-18 20:38:25 -07:00
SkyMarshal
453c0c741c Air alarm improvements. Adds Central Atmos Control and a buffer between server room and station. 
Fixes #3074
Fixes #3069
Fixes #2909
 2013-06-17 15:56:57 -07:00
Chinsky
fd13ff0d64 Merge branch 'vials' into viro 2013-06-16 11:22:15 +04:00
meyar
3769ceff4f Fixes a conflict with auto-ERT 2013-06-12 19:37:57 -04:00
Furlucis
a60dcf473b Fixed a runtime error where one thing would sometimes try to handle an empty list. Some chance that will still make a jungle map fail to work right, though. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 03:18:03 -04:00
Chinsky
0f9b53ef09 Merge pull request #3016 from NicholasDV/tweaksAndFixes 
Tweaks and fixes
 2013-06-10 02:39:40 -07:00
NicholasDV
af234f7f1d Removes a few typos from channel names 
The literal only two instance of gazette in the code.
This should fix it entirely.

fixes #3006
 2013-06-09 18:04:27 -04:00
NicholasDV
f2a16fc3cd This just fixes a small typo in build mode. 
Specifically, the throw and select buttons were 'switched'
in some instructions. This quickly fixes that!

closes #3001
 2013-06-09 03:16:51 -04:00
NicholasDV
d5c085e22a Changes to increase readability 
Specifically formatting the messages a bit differently by putting
them onto multiple lines. They line up properly inside of dream
maker, making them /much/ more readable. This format would be preferable
for new additions into this file.
 2013-06-09 03:00:47 -04:00
Kilakk
a5609c8150 Adds ability to change appearance for ERTs 
* ERTs can change their own appearance
* Fixed an if statement I goof'd
 2013-06-08 18:51:26 -04:00
Chinsky
405dff19b8 Moved virus2 out of WIP folder. 
It's been finished years ago...
Also removed Disease2 folder which is just older versions of same files.
 2013-06-08 13:00:37 +04:00
Kilakk
faf5b86e49 Changed the way ERTs are selected 
* Ghosts get a pop-up thingy that asks them if they want to be
considered
* Ghosts that're antag-banned and/or jobbanned from security officer are
exempt
* 30 second timer because timers are !!FUN!!
 2013-06-06 23:29:15 -04:00
Kilakk
d1faeac8d8 Adds emergency response team verb 
* Adds a verb for (b)admins in "Special Verbs" that lets you spawn in an
emergency response team a la deathsquid-button
* Spawned-in ERTs can choose their own ridiculous name
* Command alerts, because everyone loves those
 2013-06-06 17:04:49 -04:00
Segrain
f35290bf25 Engineering tape can be placed on doors. 2013-05-30 19:30:36 +03:00