cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,366 Commits 26 Branches 2 Tags
fcbdb53bbb4d2aa5fedea2d4191123ebd3dd121b
Commit Graph

1041 Commits

Author SHA1 Message Date
ZomgPonies
b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
ZomgPonies
706a0e14fc Fixed up Econ stuff 2013-09-17 23:07:00 -04:00
ZomgPonies
640e38ce23 Massive code fix to get the codebase ready to compile in BYOND 500 2013-09-15 23:58:16 -04:00
ZomgPonies
12f17ae15b Fix issues with air alarms: 
+ Air alarms now support monitoring presets, including Vox and server
presets.
+ Air alarms no longer refresh constantly when NOT on the main screen.
+ Reworked scrubber interface, added ability to scrub O2 (for Vox
players)
+ Attempt at fixing firedoors.
 2013-09-15 21:19:13 -04:00
ZomgPonies
c799b1bf6a SLIMAGGEDON bugfix 2013-09-10 19:31:27 -04:00
ZomgPonies
a935863200 Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings 2013-09-08 11:39:33 -04:00
ZomgPonies
ea91047ce2 Janicart/Ambulance overhaul && Added Doppler Array sprites & map 2013-09-08 09:23:49 -04:00
ZomgPonies
d2d7104703 Added fax machine to IA office 2013-09-07 21:01:43 -04:00
ZomgPonies
d342a1735c People on DocCarts can pull rollerbeds 2013-09-06 08:03:18 -04:00
ZomgPonies
ed8714550c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into Baystation12-master 
Conflicts:
	config/example/config.txt
	config/example/motd.txt
	config/example/rules.html
 2013-09-05 13:29:34 -04: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
ZomgPonies
2adc744e65 Merge pull request #1 from Baystation12/master 
More patches from BS12:master
 2013-08-13 13:39:15 -07:00
Erthilo
9d1bbb16d0 Adds explosive implant admin messages, and jump button for explosions. 2013-08-12 12:34:13 +01:00
ZomgPonies
c1272238e7 Revert "Revert "Moving files around to make code changes more modular from base BS12"" 
This reverts commit 79ff9683496a1e94b2b7cfff09234606d668b5ee.
 2013-08-12 02:04:07 -04:00
ZomgPonies
916256b400 Revert "Moving files around to make code changes more modular from base BS12" 
This reverts commit f0473c4abd99e66fd9f4225567f23ae89e354e2c.
 2013-08-12 02:04:07 -04:00
ZomgPonies
17d0a2232b Moving files around to make code changes more modular from base BS12 2013-08-12 02:04:07 -04:00
ZomgPonies
d752da826e Karma System, 1st iteration 2013-08-12 02:04:05 -04: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