Mloc-Argent
e6b44d0f35
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2013-11-14 12:03:59 +00:00
DJSnapshot
7665a1a00e
Merge pull request #3895 from Baystation12/master
...
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Chinsky
8b89b54233
Caches side effect types to a global list, less loops on addition.
...
Makes them process only every 15 ticks, to cut down on the calls.
Removes damage because it was supposed to be gone, no idea why I didn't delete the lines.
2013-11-08 03:18:25 +04:00
Chinsky
a90888b851
Missed last debug line
2013-11-08 02:10:20 +04:00
Chinsky
65c248cda0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma
2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Chinsky
9c6a51b3fb
Commens out debuglog spam in side effects
2013-11-04 22:38:55 +04:00
Cael Aislinn
a4e5bad409
fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:10:17 +10:00
Kilakk
1ed2ea6ec2
Fiddling with cooldown times
2013-10-26 13:35:31 -04:00
Kilakk
2aae632786
Added the ability to send faxes between departments
2013-10-26 13:21:56 -04:00
Nanai
c9d8fa15ab
Del rework, as requested.
2013-10-24 18:25:36 -04:00
Nanai
c9dea9b89d
New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu!
2013-10-24 15:47:26 -04:00
Segrain
14ee1bccbb
Fix for #3770 .
2013-10-13 23:04:46 +03:00
Mloc-Argent
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
Chinsky
732596805a
Merge pull request #3734 from Baystation12/master
...
Master -> dev
2013-10-06 11:39:36 -07:00
Chinsky
784b98d151
Side effects overhaul.
...
Fixed cure message spam, now they do not remanifest while cure is still in system.
Changed yiming of side effects. They now start gatherping power only when their cause is no longer active. Around 180 ticks after that they start hurties.
This way they can be cured without either giving huge doses of cure (so they outlast the causing chem) or immediate remanifesting.
Because of way that loop works (and I am too lazy to think of other way, since ithis one is not that bad) you can only cure them when they are in active phase, so just adding cure to same pill won't do.
Also I axed out last damaging stages of side effects, since they are intended to be just an annoyance, not a disability.
2013-10-06 11:59:47 +04:00
Mloc-Argent
4fa6316d39
Garbage collection for fire and explosive particles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-05 23:25:41 +01:00
Mloc
49c0a30301
Merge branch 'master' into dev
...
Conflicts:
baystation12.dme
html/changelog.html
2013-09-26 10:26:03 +01:00
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
Cael Aislinn
955160e9d6
moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-09-20 13:35:49 +10:00
Segrain
9eee328d34
Verb categories.
2013-09-19 08:30:05 +03:00
Kilakk
9bd3f2997c
Added in an awesome fax machine sprite by Cajoes
2013-09-18 19:41:29 -04:00
Kilakk
e1192fea75
World loop removed successfully
2013-09-16 17:12:36 -04:00
Kilakk
6c4644664e
Absolute paths for faxmachine procs
2013-09-16 17:09:36 -04:00
Segrain
35621466e1
Merge conflict fix.
2013-09-14 22:49:11 +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
Erthilo
3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01: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
Erthilo
4f4fb38baf
Changed pin to a 4 digit number. Game year standardised to this year +544.
2013-09-01 13:23:23 +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
