Commit Graph

612 Commits

Author SHA1 Message Date
Razharas e9bed91a1e Merge pull request #11925 from Core0verload/matter-final
Materials - final solution
2015-09-23 21:11:17 +03:00
Razharas 835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
c0 8d54f835ae Materials - final solution 2015-09-22 00:18:37 +03:00
Razharas 836c31ac83 Merge pull request #11845 from xxalpha/nanites
Added a self-repair module for cyborgs.
2015-09-21 22:06:45 +03:00
Aranclanos 6e117f031e Merge pull request #11837 from Steelpoint/GunSprites
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
Steelpoint 2f9a37d624 Changes 2015-09-21 10:21:10 +08: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
Steelpoint 3fb3b49134 Fixes 2015-09-18 20:09:57 +08:00
Steelpoint a421402cb8 SABR+Sprites+Fixes 2015-09-18 10:38:35 +08:00
xxalpha b119b0e113 Added a self-repair module for cyborgs. 2015-09-17 15:56:39 +01:00
xxalpha 1626e02302 Fixed protolathe not printing things that required reagents.
Better

Coefficient
2015-09-17 14:09:03 +01: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
Steelpoint 62e7f1204d NewChanges 2015-09-16 17:53:04 +08:00
Jordie e4979d2a90 Merge pull request #11735 from Thunder12345/cheap_tech_shells
Removed the silver cost from techshells
2015-09-14 20:36:08 +10:00
Jordie 3e6f0c87bf Merge pull request #11731 from Fox-McCloud/Impropermaterials
Fixes Consistency Issue with Materials
2015-09-13 23:13:22 +10:00
Jordie e718214a67 Merge pull request #11734 from Menshin/sheets_inserting_safety_checks
Adds boundary checks for stack sheets inserting
2015-09-13 23:13:04 +10:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Menshin 89ce4e112d Stored the material name in case the stack was deleted after the sleep() when dealing with overlays. 2015-09-13 01:57:21 +02:00
Thunder12345 de156015b7 Removed the silver cost from techshells 2015-09-12 14:46:41 +01:00
bear1ake c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Menshin ce2ee15b57 * Added boundary checks for stack sheets inserting (fixes #11732)
* Limited material inserting to stack sheets for the protolathe and banana shoes
2015-09-12 12:11:57 +02:00
Fox-McCloud 89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
Razharas f9a01d1365 Merge pull request #11580 from xxalpha/protocontainer
Changed protolathe code to use material container.
2015-09-12 08:56:47 +03:00
Razharas 4f9e6a33e0 Merge pull request #11678 from GunHog/ChemHeaterBoardFix
Fixes missing chem heater board design
2015-09-12 08:53:30 +03:00
xxalpha 28889d2b6a Changed protolathe code to use material container.
Clean proc, typo fix

Standard sheet values
2015-09-11 12:39:32 +01:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
GunHog 1d9b59e28b Fixes missing chem heater board design
- Fixes #11673 (deleted a tab)
2015-09-09 12:53:00 -05:00
Cheridan 304d91fa2c Merge pull request #11606 from Firecage/gunnames
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
bgobandit dc16dfbcc2 Fixes/tweaks slime potions. 2015-09-07 09:48:31 -04:00
Firecage 9c341fb128 This gives most projectile guns less generic names. 2015-09-06 13:43:38 +02:00
Cheridan a816ff5f8f Merge pull request #11385 from Aranclanos/extrapug
Fixes pugs not following their tail.
2015-09-04 23:20:25 -05:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Razharas 6724e65aae Merge pull request #11270 from ExcessiveUseOfCobblestone/master
Simple RnD tweaks
2015-09-01 16:40:25 +03:00
Razharas 1582526447 Merge pull request #11166 from GunHog/Sawumakesmewanttocry
E.X.P.E.R.I-MENTOR fixes
2015-09-01 16:06:58 +03:00
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas 610905bb55 Merge pull request #11342 from Fox-McCloud/emitterboard
Producible Emitter Boards at R&D
2015-09-01 10:06:03 +03:00
ExcessiveUseOfCobblestone d85cae38bb Moved to Auto 2015-08-31 15:56:42 -04:00
ExcessiveUseOfCobblestone 5dee17a846 Merge remote-tracking branch 'tgstation/master' 2015-08-31 15:54:06 -04:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Cheridan 529059c3f1 Merge pull request #11459 from bgobandit/itsafuckingpotionfuck
Refactors slime potions.
2015-08-30 20:34:45 -05:00
Razharas d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
Cheridan 32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
bgobandit edf918282e Tweaks text and numbers. 2015-08-29 19:54:44 -04:00
bgobandit 14d5cb7340 Refactors slime potions. 2015-08-29 02:42:54 -04:00
ExcessiveUseOfCobblestone 4c47a7cf5e Merge remote-tracking branch 'tgstation/master' 2015-08-27 20:02:02 -04:00
c0 8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
xxalpha 19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc.
Return ..()
2015-08-27 11:10:58 +01:00
Aranclanos 460c2c290c Fixes the admin message not appearing under certain conditions when the rapid dupe experimentator relic is used.
All objects from said relic will spawn at the same time now.
2015-08-25 05:31:02 -03:00