Commit Graph

1060 Commits

Author SHA1 Message Date
ZomgPonies
cc437cbd4b Belt of holding 2013-11-04 07:49:03 -05:00
ZomgPonies
b2b623cac8 Programmable cargo machines 2013-11-04 07:48:55 -05:00
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00
ZomgPonies
7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
ZomgPonies
2df877bf82 Xenoarch update 2013-10-29 11:56:04 -04:00
ZomgPonies
2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies
9206487820 Can now send faxes between fax machines 2013-10-28 02:35:30 -04:00
ZomgPonies
f5b555bdd3 Adding Supermatter 2013-10-28 02:35:20 -04:00
ZomgPonies
0d42f95633 Fixes 2013-10-22 03:41:32 -04:00
ZomgPonies
2907deae87 New barber shop. Can now shave corgis. 2013-10-17 16:18:35 -04:00
ZomgPonies
355f52ea7d Medical sideffect runtime fixes 2013-10-14 01:28:29 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
771de60525 Optimizations and bugfixes galore 2013-10-08 10:32:47 -04:00
ZomgPonies
e4145fdac3 Added store computer & minor updates 2013-10-05 03:24:22 -04:00
ZomgPonies
aa79d1323b Added Vox and Kidan as unlockable Karma species 2013-10-04 02:57:42 -04:00
ZomgPonies
b0f17fec44 Moar fat uniforms 2013-09-29 20:59:54 -04:00
ZomgPonies
8a529ab74c Nano UI for Air Alarms 2013-09-29 20:58:19 -04:00
ZomgPonies
a19e0f8c81 Fixed Karma verbs 2013-09-28 20:42:42 -04:00
ZomgPonies
6b90da203f Updates Fax code and added sprite 2013-09-24 20:11:19 -04:00
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