Commit Graph

1965 Commits

Author SHA1 Message Date
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
mwerezak
69284990a3 Merge remote-tracking branch 'upstream/dev' into runtime
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
2015-02-15 22:24:36 -05:00
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak
01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
mwerezak
fc6dfb5f1b Ammo magazine and casing update
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
SkyMarshal
84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
ccomp5950
a07e0a044f Added buttons back to Mentors
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
2015-02-07 00:04:50 -05:00
Zuhayr
402987edc3 Merge with dev. 2015-02-07 14:44:55 +10:30
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName
Silicons can now more easily be correctly renamed.
2015-02-06 00:15:07 +03:00
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr
5890fa3c4b Added plant controller. 2015-02-05 15:53:20 +10:30
Ravensdale
7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Ravensdale
fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
PsiOmega
1a1bf4a718 Silicons can now be easily renamed.
Moves the AI SetName proc down silicon level.
2015-02-04 09:48:30 +01:00
Zuhayr
11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Zuhayr
fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
Zuhayr
09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
Zuhayr
43802dceb7 Removed TRAIT_LIFESPAN. 2015-02-04 10:49:30 +10:30
Zuhayr
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +10:30
Zuhayr
b791c92c6e Added a fruit spawning debug proc. 2015-02-04 10:37:40 +10:30
Ravensdale
2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
GinjaNinja32
c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro
Conflicts:
	code/modules/virus2/disease2.dm
2015-02-03 15:33:37 +00:00
PsiOmegaDelta
70e8efb9fa Merge pull request #8018 from GinjaNinja32/ai
Adds AI latejoin
2015-02-03 16:10:46 +01:00
PsiOmega
1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
SkyMarshal
8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
Chinsky
72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00
GinjaNinja32
271fe31e64 Admin verb to toggle latejoin-ability. Wipe Core disallowed in malfunction. 2015-02-02 18:34:26 +00:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
ccomp5950
b23b5b5d41 Removes categorization of Ahelps. 2015-01-31 21:13:05 -05:00
Loganbacca
fbabdce615 Finished renaming nuclear mode to mercenary
Mostly cleans up the admin side of things.
2015-01-27 13:42:27 +13:00
mwerezak
58bb2f22cd Implements making friends with Runtime 2015-01-25 02:39:40 -05:00
Zuhayr
5c37b9e58c Committing some maze fixes and trying to reproduce a weird DD bug. 2015-01-23 13:40:06 +10:30
Zuhayr
07793edc85 Converted mining map over to this new system. Currently broken. 2015-01-23 13:40:03 +10:30
GinjaNinja32
a1e5194c34 Virology rebalance
- Effects can now appear and be spliced in at higher stages than their set stages (e.g. Waiting Syndrome can now occur in any block)
- Gibbingtons changed to not instantly gib infected on activation, instead either dealing massive brute damage or making humanoids' limbs fall off; this avoids three copies of Waiting Syndrome then Gibbingtons going undetected until it instagibs the entire station one after the other.
- New effect: chemical synthesis. Picks one reagent from its list, and keeps infected at 5-7u of that reagent. Infecting others, splicing the gene, etc does not change the reagent, only generating an entirely new chemical synthesis effect does that.
- Admin panel for spawning viruses
- Virus dish examine() now doesn't print 15+ lines to output, instead printing one line and a link to open a window with the rest (and it calls ..() now)
- Lowercased most virology machinery's names
- Renamed/reordered antigens, there are now 16 antigens rather than 11, and they don't use the blood markers' names despite not being affected by blood type at all
- Generating random effects does not rely so much on the GC
2015-01-20 09:57:47 +00:00
Zuhayr
aa5013fa08 Merge pull request #7885 from Baystation12/master
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
PsiOmega
02581042d7 Fixes #7644.
Makes it possible for admins to properly rename AIs, either by right-clicking the relevant AI or by using the verb in the Admin panel.
2015-01-16 11:23:08 +01:00
Chinsky
ac20d0b23b Fixes #7827 2015-01-16 12:19:53 +03:00
Kelenius
6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Zuhayr
8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
mwerezak
1c5ca01dae Restricts Gibbingtons, Suicide, and Monkism syndromes
Restricts Gibbingtons, Suicide, and Monkism syndromes from even greater
diseases. Admins can still generate diseases with these syndromes
through secrets.

Fixes virus events potentially having people share the same virus datum.
2015-01-10 03:08:42 -05:00
Zuhayr
66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30