Commit Graph

11004 Commits

Author SHA1 Message Date
Segrain
183c44c4c8 Smallfix. 2013-10-18 08:38:14 +03:00
jack-fractal
3732a9c3b9 Adding the dispensers to the cargo lists.
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
2013-10-17 19:48:57 -04:00
Segrain
cad425f2ca Roundend declaration. 2013-10-17 04:07:29 +03:00
Segrain
6184ad729f Cardfix. 2013-10-17 04:01:46 +03:00
Segrain
da96d45bc0 Smallfix. 2013-10-17 04:00:33 +03:00
Segrain
6ece0850af Volume fix. 2013-10-17 03:53:03 +03:00
Segrain
1d1d611087 Quillsfix. 2013-10-17 03:51:56 +03:00
Chinsky
dcde181bee SOMEONE did not put surgery things on new clickcode, so I done that. 2013-10-16 17:14:09 +04:00
Mloc
90378111e1 Fixes #3777
Signed-off-by: Mloc <colmohici@gmail.com>
2013-10-16 11:21:51 +01:00
Chinsky
930a30cfd0 Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file 2013-10-16 12:51:30 +04:00
Chinsky
55ea60a785 Fixed derpy type of psych couch 2013-10-16 12:50:40 +04:00
Chinsky
f3028d3edd Attempted fix #3769
Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day
2013-10-16 11:28:41 +04:00
Chinsky
a7be4d9353 Fixes #3781
Magical thingies now go zzap instead of click click when empty.
2013-10-16 11:06:43 +04:00
Chinsky
ac7aae7358 Fixed #3776
Missed update_body calls
2013-10-16 10:57:19 +04:00
DJSnapshot
4b8621bcef Temporary patch so aliums can use magboots until the hardsuit rework gets merged. 2013-10-15 23:06:02 -07:00
Chinsky
d85940ff3b Merge pull request #3775 from DJSnapshot/adminfeatures
expanded mod powers
2013-10-15 00:24:39 -07:00
DJSnapshot
3d83eafbae teensy spot missed. 2013-10-15 00:19:34 -07:00
DJSnapshot
8af4d1eadf Fixed random git bug 2013-10-15 00:14:21 -07:00
Chinsky
41377d4122 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-10-15 10:59:06 +04:00
Chinsky
7c681b2bd8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/modules/mob/new_player/new_player.dm
2013-10-15 10:56:50 +04:00
DJSnapshot
c7821741c2 Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging. 2013-10-14 23:48:26 -07:00
Chinsky
6a2c91196a Merge pull request #3771 from Mloc/newzasfix
Small work on making zones wake up on geometry changes.
2013-10-14 02:12:12 -07:00
Mloc
87037847ce Merge pull request #3773 from Aranclanos/EmitterBeams
Duplicates the speed of the gameticker!
2013-10-13 14:06:03 -07:00
Aranclanos
9af5c85c58 Duplicates the speed of the gameticker!
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.

This will add lag due to everything being faster.
2013-10-13 17:11:39 -03:00
Segrain
14ee1bccbb Fix for #3770. 2013-10-13 23:04:46 +03:00
Mloc-Argent
24994ec752 Small work on making zones wake up on geometry changes.
Also added sleeping for zones with unsimulated tiles; unfortunately it probably won't happen for ages due to a dichotomy paradox.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-13 19:44:12 +01:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04:00
Segrain
21718c5bac Fix for #3764. 2013-10-13 03:44:43 +03:00
Segrain
bcba722bbd Fix for #3763. 2013-10-13 03:44:17 +03:00
Segrain
f725215857 Missing verbs. 2013-10-13 03:43:06 +03:00
Segrain
da0716adb3 Merge remote-tracking branch 'upstream/master' into dev 2013-10-13 03:33:26 +03:00
Segrain
f2bbc60d51 Order fix. 2013-10-12 21:19:54 +03:00
Segrain
b39dfc5229 Smallfix. 2013-10-12 19:49:29 +03:00
Mloc
5e4f389e6f Merge pull request #3725 from comma/lockdown
Lockdown
2013-10-12 06:46:36 -07:00
Segrain
77748f1116 Mecha weapons. 2013-10-12 14:41:24 +03:00
Segrain
34a6735ef8 ERT mecha beacons. 2013-10-12 14:31:12 +03:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze
freeze -> dev
2013-10-11 11:41:06 -07:00
Mloc
1b9e5c81ea Merge pull request #3756 from comma/tableflip
Tableflips & cover system
2013-10-11 11:36:31 -07:00
Chinsky
01512e571b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into lockdown
Conflicts:
	code/game/machinery/doors/firedoor.dm
2013-10-11 22:29:59 +04:00
Chinsky
05bb07375e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger 2013-10-11 22:22:08 +04:00
Chinsky
a18fbaac1d Cover system.
Tables now give some cover from bullets and beams.
Standing behind the table gives you 20% chance of table taking the hit instead.
Flipped table gives +20%, but only if bullet comes from the side it faces. Otherwise no cover is provided at all.
Lying on the floor gives +20%.

Table takes half of damage human would, and breaks down after its health goes to zero.
Reinforced talbes have double the health, wooden ones - half.
2013-10-11 22:17:45 +04:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions.
- fixing the changelog
2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
3d6791df81 Fix for pockets. 2013-10-11 10:22:58 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
7ea98f6d79 Examining fix. 2013-10-11 10:19:58 +03:00
Segrain
464fc22fa5 Missing verb. 2013-10-11 10:18:43 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00