Commit Graph

1584 Commits

Author SHA1 Message Date
Razharas 8d3b1ac018 Merge pull request #12202 from Xhuis/autorifle_removal
Armory re-mapping and autorifle removal
2015-10-10 03:21:52 +03:00
Cheridan 136140614d Merge pull request #12151 from AnturK/larvafix
Misc Fixes
2015-10-08 07:20:30 -05:00
Xhuis 406f727ead Armory remap, autorifle removal 2015-10-08 08:03:58 -04:00
AnturK 75e82f15f2 Return for buckling procs
Makes unbuckling priority over removing bag in janicart
Makes doors bumped in janicart open.
2015-10-08 13:40:53 +02:00
Razharas 7aae089d5a Merge pull request #12094 from AnturK/mapcase
Adds support for custom showcases on the map
2015-10-07 22:26:43 +03:00
Swag McYolosteinen 38f5c0c85a Merge pull request #12122 from Steelpoint/Magazine
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
AnturK b7a1ee7cfa Adds display case repair 2015-10-05 13:07:58 +02:00
Razharas 653e5d18f3 Merge pull request #12027 from Fox-McCloud/advancedmop
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Steelpoint b5ded1c9e8 InitalCommit 2015-10-03 21:22:29 +08:00
AnturK bc5d660fe0 Adds support for custom showcases on the map 2015-10-01 00:38:29 +02:00
phil235 4694616e6b Merge pull request #11922 from AnturK/corgiriders
Moves buckling from obj to atom/movable
2015-09-30 23:26:57 +02:00
Cheridan 7367ea771c Merge pull request #12054 from Incoming5643/Boxes_of_the_Spessmen
Dials back the boxes [poll]
2015-09-28 23:58:19 -05:00
Razharas 50dd1f6b67 Merge pull request #12031 from Xhuis/a_pretty_rad_pr
Radiation changes
2015-09-28 03:24:43 +03:00
Incoming 7a4be0e04f Merge branch 'master' of https://github.com/tgstation/-tg-station into Boxes_of_the_Spessmen
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-27 18:48:57 -04:00
Incoming 52123f879f There are no more random boxes
Maps now have two guaranteed spawns, one in maint and one in the cargo warehouse. You can still build more boxes yourself.

The ! easter egg can now only ever proc once per box. Once it's triggered that's the end of it.
2015-09-27 18:39:44 -04:00
Aranclanos a135f12e3f Merge pull request #11990 from optimumtact/patch-1
Comment war continues
2015-09-27 17:31:48 -03:00
Fox-McCloud 32cd0d49bb soap for the janitor 2015-09-27 07:07:27 -04:00
Xhuis 5f99b313cc Radiation changes 2015-09-26 13:33:27 -04:00
Razharas d17f621389 Merge pull request #11972 from KorPhaeron/fix
Kitchen Spike Hotfix
2015-09-25 22:05:28 +03:00
KorPhaeron 76928b467b Fixes var names 2015-09-25 12:25:51 -05:00
KorPhaeron 58c5404947 Fix 2015-09-25 12:22:29 -05:00
Razharas 7c757a735f Merge pull request #11968 from xxalpha/hot_or_not
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00
oranges 4ba7259666 Comment war continues
shake it off
2015-09-25 09:05:22 +12:00
Razharas 40e97a5f7b Removes the fun
Removes the fun
2015-09-24 23:58:07 +03:00
Razharas 3c4994749b Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction 2015-09-24 23:52:38 +03:00
AnturK a99ed56f27 Atom Buckling - Squashed 2015-09-24 16:21:05 +02:00
xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
KorPhaeron ce9ec8af68 Fixes mobs flipping updside down forever on spikes 2015-09-23 20:13:41 -05:00
xxalpha 655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Razharas d3aa84e978 Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
Razharas 99d8e089c4 Merge pull request #11913 from Xhuis/based_space_gods_this_no_smoking_sign_is_troubling_my_autism
Minor feature package
2015-09-24 02:12:23 +03:00
Razharas 1105a2b820 Merge pull request #11899 from kingofkosmos/altclickrotatepipe
Alt-click to rotate stuff
2015-09-24 01:59:04 +03:00
KorPhaeron 2e8e8a15c7 Oops 2015-09-23 13:17:15 -05:00
KorPhaeron b4eea5144b Timer 2015-09-23 13:13:24 -05:00
KorPhaeron c11edd8418 Butcher update 2015-09-23 12:30:56 -05:00
KorPhaeron 0afa381114 Removes potential exploit 2015-09-22 20:12:14 -05:00
xxalpha 36ae116a48 Added another mode for smoothing (smooth with all subtypes). 2015-09-23 00:55:10 +01:00
Xhuis 05435d4ff7 Some code improvements 2015-09-22 17:24:59 -04:00
xxalpha fc073def62 Merge remote-tracking branch 'upstream/master' into smoothlattice 2015-09-22 19:40:01 +01:00
Razharas 835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
KorPhaeron 1484390e76 Removes extra bits 2015-09-22 06:05:17 -05:00
KorPhaeron cce0bf2e9d Meatspike 2015-09-22 05:33:02 -05:00
Xhuis 4e1dda3da9 New tome sprite and some more work 2015-09-21 21:13:27 -04:00
Xhuis 100e33627d Construction expansion 2015-09-20 23:09:14 -04:00
kingofkosmos 65c516607f Adds altclick rotation + description to doppler array, transit tubes, windoor assembly, infrared emitter, emitter, particle accelerator, disposal tubes. 2015-09-20 18:54:23 +03:00
kingofkosmos 14332a0d3a Adds altclick-rotation + descriptions for chairs and windows. 2015-09-20 17:50:41 +03:00
phil235 6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02:00
phil235 f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
xxalpha 6bdd100eb6 Lattices and catwalks now use generic icon smoothing.
Put another check in smooth code to prevent runtimes
2015-09-19 14:55:09 +01:00
AnturK a524268b4d Fix 2015-09-17 17:53:27 +02:00