Commit Graph

17166 Commits

Author SHA1 Message Date
Joan Lung
edb72f83e3 Colossus will now chase down sleeping carp users 2016-08-04 10:40:32 -04:00
oranges
d7c49447cf Merge pull request #19633 from ChangelingRain/ipulledanditjustcameoffidontwantitanymoreletmeleaveitthere
Bodyparts will now always appear above items and are not destroyed by the blob
2016-08-03 10:46:47 +12:00
Joan Lung
02088cf78d HUD health bars will now appear in the top left for exceptionally large mobs (#19626)
* HUD health bars will now appear in the top left for exceptionally large mobs

* it's mobs mobs is what's inside

* thanks orange
2016-08-03 10:44:54 +12:00
oranges
04fe7d8a93 Merge pull request #19649 from ModernViolence/ModernViolence/fix#19596
Modern violence/fix#19596
2016-08-03 10:19:03 +12:00
lordpidey
d923e16044 Adds "law 666" for cyborg devils. (#19646)
* Adds "law 666" for robot devils.

* Minor refactors for Remie

* Fixes compile error.

* I'm an idiot.
2016-08-03 10:18:37 +12:00
Joan Lung
021d50abc4 Removes some copypasted code for megafauna devouring (#19644)
* Removes some copypasted code for megafauna devouring

* touch and eat
2016-08-03 10:18:28 +12:00
oranges
ed41b642ed Merge pull request #19634 from RemieRichards/captain_jean_luc_picard_of_the_uss_enterprise
Adds Star Trek uniforms spawnable by admins.
2016-08-03 10:15:42 +12:00
Joan Lung
992c0debbd Megafauna now have some innate light (#19632)
* Megafauna now have some innate light

* is the byond ref on this correct with it saying the default value is 0
let's find out
2016-08-02 17:08:51 -05:00
Joan Lung
ef6207321a Fixes Legion eventually becoming hilariously small (#19631) 2016-08-02 09:22:20 -05:00
oranges
b7d446c81c Merge remote-tracking branch 'core/pockets' into upstreamasterunsafe 2016-08-01 23:38:55 +00:00
Paxton Prescott
d1346f914e Fix #19596: fixed inserting and removing things in and out of photocopier: now we correctly pass user variable into remove_photocopy() and do_insertion() 2016-08-02 04:17:23 +05:00
Joan Lung
01e74ea035 Colossus now uses an overridden devour() proc to disintegrate (#19618) 2016-08-01 16:03:37 -05:00
oranges
b91e14c826 Merge pull request #19472 from Fox-McCloud/refund-refactor
Refactor Uplink Refunding
2016-08-02 08:59:15 +12:00
oranges
7eef456fa9 Merge pull request #19615 from ChangelingRain/betweensecondandfourthhersymbolshinesliketheonesitbordersbutunlikeboth
Explosive guardian traps will no longer trigger on invalid targets
2016-08-02 08:57:37 +12:00
Joan Lung
6503fc05d1 Colossus should no longer kill your ears while trying to kill you (#19637) 2016-08-01 15:56:56 -05:00
oranges
6a470a7526 Merge pull request #19613 from ChangelingRain/thebandsaroundherarmsaremadeofsixmaterialssixmetalstheycomplimentandcontainher
Soul Vessels can now be used similarly to soulstones
2016-08-02 08:56:22 +12:00
Joan Lung
da1973fabb Megafauna melee attacks should no longer cause excessive ranged attack use (#19638) 2016-08-01 15:56:01 -05:00
oranges
2858ad7a98 Merge pull request #19610 from Cruix/biogenerator_refactor
Biogenerator Refactor
2016-08-02 08:55:24 +12:00
oranges
c315dfa3e3 Merge pull request #19606 from KorPhaeron/dronebuffs
Fixes drones being hurt by shocks
2016-08-02 08:55:15 +12:00
Paxton Prescott
6a5710787b Fix #19596. Photocopier: if copy of paper has words on it, the icon should be with words on it 2016-08-02 01:31:55 +05:00
Remie Richards
b9b480fbdd Adds Star Trek uniforms spawnable by admins. 2016-08-01 16:01:09 +01:00
Joan Lung
9dac1b1be4 Bodyparts will now always appear above items and are not destroyed by the blob 2016-08-01 10:39:28 -04:00
bawhoppen
1fecd12aaf no really who is da king (#19537)
add: Added crowns. Make them from gold. Cap gets a fancy one.

Crowns get some armor but are overall worse than sec gear.
2016-08-01 13:58:11 +12:00
ma44
7a4c553584 Tweaks saltpetre some more and fixes a bug where the self sustaining upgrade provides less nutrition when it's upgraded (#19601)
Tweaks saltpetre some more and fixes a bug where the self sustaining upgrade provides less nutrition when it's upgraded
2016-08-01 12:38:15 +12:00
oranges
baad4b8399 Merge pull request #19590 from ChangelingRain/afloweringhatelikethetouchofsomeoneyouhatethenameyoucantlistento
Megafauna will now occasionally use their ranged attacks in melee
2016-08-01 10:58:08 +12:00
Joan Lung
0cd263ab6f Bubblegum's charge will automatically smash through obstacles (#19599)
* Bubblegum's charge will automatically smash through obstacles

* fuck everything in the area with your giant yaoi hands, bubblegum-sama

* these hands
2016-08-01 10:57:53 +12:00
oranges
68e85feb47 Merge pull request #19589 from ChangelingRain/ahorriblewishacursecutshortawantsodeepitrunsinboneandbrain
Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage
2016-08-01 10:57:45 +12:00
oranges
1dbff72fac Merge pull request #19597 from ChangelingRain/icantstopthistouchtheworldstouchacaressastrikeitslikesandintheairflayingoffmywisheslikeasandstorm
Bubblegum's blood spray and Drake fire breath now stop on solid turfs
2016-08-01 10:57:33 +12:00
Joan Lung
95439cb8fe Explosive guardian traps will no longer trigger on invalid targets 2016-07-31 16:53:03 -04:00
Joan Lung
f932efdceb Soul Vessels can now be used similarly to soulstones 2016-07-31 16:06:29 -04:00
Robustin
3542ac4e48 Removed Amber ERT's thermals (#19595)
* Update ert.dm

* Update ert.dm
2016-07-31 11:42:13 -05:00
Cheridan
cd96c20f60 Merge pull request #19593 from ChangelingRain/youcanwaititoutforeveraslongasyoudontsayitbutevenifidontsayitistillfeelitlikeahandintheairholdingtight
HUDs no longer adjust in size with their atom's transform
2016-07-31 10:05:20 -05:00
unknown
1b9256857c Made biogenerator recipes into research datums.
Added the ability to upload designs into biogenerators.
Added make_reagents to design datums.
Added Biomass material.
2016-07-31 10:47:36 -04:00
Fox-McCloud
bba7fab257 additions 2016-07-31 09:57:11 -04:00
KorPhaeron
e7ddd053d9 Fixes drones being hurt by shocks 2016-07-31 00:05:06 -05:00
oranges
55fc874783 Merge pull request #19573 from Cruix/photo_fix_3
Fixes photo health desciptions
2016-07-31 17:03:53 +12:00
oranges
d4c4311f43 Merge pull request #19578 from ChangelingRain/heraldicsheriseswingslikesandstonebindingringsofeverymetalholdingthetidingsofearthtoher
Megafauna will now seek out and consume corpses
2016-07-31 17:03:39 +12:00
lordpidey
ec2f666f29 Devil agent (#19391)
add: Added Devil agent gamemode, where multiple devils are each trying to buy more souls than the next in line.
add: If you've already sold your soul, you can sell it again to a different devil. You can even go back and forth for INFINITE POWER.

This adds a new gamemode. Devil Agent. It works much like Double Agent, except devils instead of traitors, and instead of killing, the devil simply has to control more souls than the enemy.

Also, whether this is included in the rotation depends on the config settings. By default, it will be disabled.
2016-07-31 17:02:21 +12:00
ma44
b01460c2bf Update hydroponics.dm (#19575) 2016-07-30 19:35:05 -05:00
Joan Lung
b7c3815023 Bubblegum's blood spray and Drake fire breath now stop on solid turfs 2016-07-30 16:07:09 -04:00
Joan Lung
0530d78a7f HUDs no longer adjust in size with their atom's transform 2016-07-30 10:36:50 -04:00
Joan Lung
13d615a6d6 Megafauna are no longer less lethal in melee 2016-07-30 09:20:45 -04:00
Joan Lung
60b32ddd85 Simple animals can now have a set amount of damage to deal to objects in place of normal melee damage 2016-07-30 09:14:53 -04:00
oranges
96a105a1c6 Merge pull request #19558 from ChangelingRain/thehurtinherbonestheweaknessinherisgoneshenolongerhasthecalmgraceofthedyingshetakesontherecklessgraceofsomeonewhoknowsshecantlose
Drakes should no longer attack objects or try to path to targets while swooping
2016-07-30 22:53:40 +12:00
oranges
ecf9bd355c Merge pull request #19554 from KorPhaeron/turrets
Simple animals will seek out and smash active turrets
2016-07-30 22:53:09 +12:00
oranges
84cc7adfd4 Merge pull request #19535 from GunHog/You_Live_Like_A_Clown_You_Die_Like_A_Clown
Sad Trombone implant is now buildable!
2016-07-30 22:52:32 +12:00
oranges
0ed0adf83e Merge pull request #19556 from KorPhaeron/shocking
Simple animals can be hurt by lightning/tesla
2016-07-30 22:50:47 +12:00
oranges
49130b051e Merge pull request #19480 from AnturK/noidonntwanttobexenobiopet
"Never for this round" ghost poll generalization
2016-07-30 22:48:57 +12:00
c0
a0c9f24936 Adds pockets 2016-07-30 12:28:16 +03:00
Joan Lung
6420133479 hear 2016-07-29 22:44:37 -04:00