paprka
1c59e972ce
adds iv drip and blood packs to the map
2015-01-26 00:21:11 -08:00
paprka
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
paprka
d9f49a4eb5
colon and locate() for blood
2015-01-25 16:53:12 -08:00
Remie Richards
f7730eeaef
Merge pull request #7087 from paprka/readdjanikart
...
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
Swag McYolosteinen
39a9283592
Merge pull request #7329 from Deantwo/PencodeAftermath
...
Pencode aftermath changes
2015-01-25 18:40:35 +01:00
Swag McYolosteinen
1bccc65bc1
Merge pull request #7331 from Iamgoofball/patch-14
...
Makes say mods from genetic disabilties get handled after stuttering
2015-01-25 18:40:24 +01:00
Swag McYolosteinen
ba5c28d6f8
Merge pull request #7323 from Cheridan/weaken_cleanup
...
Fixes Weaken() for Ergo
2015-01-25 15:22:39 +01:00
Cheridan
8c893f6aca
Merge pull request #7065 from phil235/GibtoniteLogFix
...
Gibtonite log fix
2015-01-25 00:29:18 -06:00
Cheridan
637e005646
Merge pull request #7322 from Jordie0608/notlikeanyoneusesthemanyway
...
Fixes default medipens being empty
2015-01-24 23:56:52 -06:00
paprka
120402e36f
added blood packs and iv drips to cargo
2015-01-24 21:27:24 -08:00
Razharas
f7a32789fb
Merge pull request #7306 from hornygranny/wzhzhzh
...
Renames ridiculous proc
2015-01-25 04:21:00 +03:00
Cheridan
d073c7f624
Merge pull request #7307 from Menshin/donuts_startup_runtimes_fix
...
Fixes runtimes related to donuts on startup
2015-01-24 16:55:43 -06:00
Menshin
cc2238e5a8
Missed one
2015-01-24 23:46:05 +01:00
tkdrg
d7a942901f
Merge pull request #7159 from Jordie0608/whatdothenumbersmean
...
Prevents permabans from noting as 0 minute bans
2015-01-24 15:18:56 -03:00
hornygranny
74ebc81149
Update microwave.dm
...
fine
2015-01-24 08:46:41 -08:00
Deantwo
0e8156814f
Font Define'ers Renamed
...
- Renamed font define'ers.
- Removed font duplicate define'ers.
2015-01-24 17:32:17 +01:00
Iamgoofball
1ef4df75da
Makes say mods from genetic disabilties get handled after stuttering
2015-01-24 08:30:39 -08:00
Jordie0608
de2965a939
changed note check to temp
2015-01-25 02:22:28 +11:00
Deantwo
c05dc2a350
Cancelling Paper Input Fix
...
Small fix to make the proc return rather than execute with an empty
input.
2015-01-24 16:20:27 +01:00
Deantwo
bfea67611e
Pencode Changes Cleanup
...
- Moved the "parsepencode" proc from **newscaster.dm** and **PDA.dm** to
**text.dm** as a global proc.
- Made the "parsepencode" proc accept only a single agrument if desired.
- Removed the font constants from **newscaster.dm**, **PDA.dm**,
**paper.dm**, **paperbin.dm**, and **photocopier.dm**.
- Replaced aforementioned constants with define'ers in **misc.dm**.
2015-01-24 16:07:13 +01:00
phil235
6adce739b1
little fix
2015-01-24 14:13:28 +01:00
Swag McYolosteinen
d26e40a6ee
Merge pull request #7282 from Firecage/SkinningMonkeysXenos
...
Adds the ability to remove monkey/xeno skins and make costumes with them
2015-01-24 14:06:13 +01:00
Swag McYolosteinen
ab0518ef55
Merge pull request #7203 from Delimusca/theyshootback
...
Night of the living deathwands
2015-01-24 13:55:09 +01:00
Swag McYolosteinen
de47d7cea6
Merge pull request #7298 from paprka/fixlmg
...
fixes borg lmg
2015-01-24 12:49:47 +01:00
Swag McYolosteinen
48dd46a282
Merge pull request #7295 from paprka/jamesbondiguess
...
Restores the ability to attach suppressors
2015-01-24 12:49:35 +01:00
paprka
d13288350a
fixes noblood check
2015-01-24 01:51:14 -08:00
paprka
279c2709d4
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-24 01:40:51 -08:00
paprka
f071655ea4
updates and optimizations
2015-01-24 01:12:57 -08:00
paprka
5361458b51
some updates
2015-01-23 21:00:09 -08:00
Jordie0608
0c6dda8155
Fixes default medipens being empty
2015-01-24 15:52:26 +11:00
Cheridan
d649846100
Fixes Weaken() for Ergo
2015-01-23 22:50:59 -06:00
Cheridan
a5aeb498f2
Merge pull request #6753 from Ergovisavi/abriums_on_fire_rolling
...
Makes aliens process reagents again & Stop, drop 'n roll ignores CANWEAKEN requirement
2015-01-23 22:33:05 -06:00
Cheridan
c0e2bc45bf
Merge pull request #7213 from Iamgoofball/patch-11
...
Allows Space Cleaner to clean off Colorful Reagent effects
2015-01-23 21:20:34 -06:00
Iamgoofball
e43ba66e0f
Update Chemistry-Reagents.dm
2015-01-23 19:13:49 -08:00
Razharas
709b6c8a33
Merge pull request #7278 from sawu-tg/expexpanded2
...
Changes/Fixes/Features to the Experimentor
2015-01-24 05:30:19 +03:00
paprka
3430cfaf44
Merge branch 'master' of https://github.com/tgstation/-tg-station into jamesbondiguess
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-01-23 16:55:52 -08:00
Ergovisavi
cdc1a3194a
Merge pull request #7095 from Miauw62/assthecopying
...
Makes photocopiers less exploitable.
2015-01-23 13:44:18 -08:00
Menshin
32df60510c
Fixes runtimes related to donuts on startup
2015-01-23 20:44:24 +01:00
Hornygranny
2751a6ac8a
renames proc
2015-01-23 11:39:06 -08:00
Sawu
ec31f83813
Fixes a missed span
2015-01-24 05:32:51 +11:00
Steelpoint
217809bab6
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecSprtites2015
...
Conflicts:
icons/mob/uniform.dmi
2015-01-24 01:11:14 +08:00
Swag McYolosteinen
16c424af6c
Merge pull request #7206 from phil235/CargotechJumpsuitSpriteFix
...
Fixes cargotech jumpsuit onmob sprite
2015-01-23 17:50:34 +01:00
Swag McYolosteinen
d19f48fe15
Merge pull request #7265 from Firecage/ProtoSMGpin
...
Fixes proto SMG having a firing pin.
2015-01-23 17:48:21 +01:00
Swag McYolosteinen
7a05b943ed
Merge pull request #7180 from Firecage/nanites_to_nanomachines
...
This changes the robotics transformation nanites ID to nanomachines
2015-01-23 17:46:17 +01:00
Swag McYolosteinen
f0294fa3b4
Merge pull request #7266 from Firecage/Ore_redemtion_machine
...
Fixes ore redemption machine screwdrivering
2015-01-23 17:45:14 +01:00
Swag McYolosteinen
c8a6b3d331
Merge pull request #7267 from RemieRichards/SyndiBorgAccess
...
Fixes Syndiborg Lock/Cover Access
2015-01-23 17:44:46 +01:00
Swag McYolosteinen
10ea66cb6b
Merge pull request #7164 from Steelpoint/ERTBalanceV1
...
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
2015-01-23 17:16:33 +01:00
paprka
d96c9c2fdd
fixes borg lmg
2015-01-23 02:57:52 -08:00
Firecage
d8b99bbab1
Merge conflict fix
2015-01-23 07:52:24 +02:00
tkdrg
7df272f3d6
Merge pull request #7128 from Jordie0608/timeforanewnew()
...
Reagent container spawning refactor
2015-01-23 02:38:42 -03:00
