Commit Graph

1564 Commits

Author SHA1 Message Date
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
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
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
AnturK
a668109c3d Adds ID unlocking
Fixes directional issues
2015-09-17 17:53:26 +02:00
AnturK
8067597beb Display case chasssis 2015-09-17 17:53:26 +02:00
AnturK
b72de17b50 Adds icon for open but not broken case. 2015-09-17 17:53:25 +02:00
AnturK
ac813a0ced Display cases 2015-09-17 17:53:24 +02:00
Incoming5643
d2a1028a53 Patches up some animation mechanics misconceptions 2015-09-17 11:26:04 -04:00
Cheridan
76d1e6add5 Merge pull request #11556 from bgobandit/hardmeatspike
MEAT SPIKE EXPANSION
2015-09-16 20:19:42 -05:00
Swag McYolosteinen
3ef5d02cee Merge pull request #11689 from Steelpoint/RifleS
Security Weapon Overhaul: Auto Rifle Edition
2015-09-16 13:34:35 +02:00
Razharas
73db85100c Merge pull request #11769 from phil235/FixMutations
Some dna fixes
2015-09-15 22:31:59 +03:00
Aranclanos
da3213968c Merge pull request #11780 from optimumtact/patch-5
EXTERMINATE EXTERMINATE EXTERMINATE
2015-09-15 16:02:32 -03:00
phil235
2a5d0b96a1 Merge pull request #11747 from Aranclanos/falsewalls
Fixes false walls opening sprite
2015-09-14 20:33:12 +02:00
phil235
e46f764113 Merge pull request #11623 from Fox-McCloud/qmvoucher
Adds Mining Voucher to QM's Locker
2015-09-14 19:59:47 +02:00
Jordie
41e426c5ef Merge pull request #11744 from Thunder12345/cap-uniform
Added a new formal jacket to the captain's locker
2015-09-14 20:36:15 +10:00
Orange Borg
27a23a845f EXTERMINATE EXTERMINATE EXTERMINATE 2015-09-14 22:06:47 +12:00
Incoming5643
ca101e4d82 Upgrades the anti spam flag to five minutes
Come in from downwind, then pull up fast! Get ready to fast rope down to Shell One! Five minutes to ETA! Alpha, your top priority is to rescue and safeguard the President! Team Bravo, watch out for Stillman's back, and get those C4's disarmed!
2015-09-13 19:10:59 -04:00
phil235
428a28a440 Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
Thunder12345
6724b7bca7 Make formal jacket a subtype of the carapace, replaces spare carapace in captain's locker, and is armoured 2015-09-13 17:10:30 +01:00
Swag McYolosteinen
ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Fox-McCloud
9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Steelpoint
5783cdda03 Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
Aranclanos
c4505bd25b Fixes false walls opening sprite and a small runtime when they finish their opening or close in the GC queue. 2015-09-12 20:37:22 -03:00