Fox-McCloud
80587202fe
forcemove fixes
2017-01-27 21:03:57 -05:00
Fox-McCloud
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
Crazy Lemon
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
Fox-McCloud
36bfee25dc
last of the missing stuff, hopefully
2017-01-24 18:33:22 -05:00
Fox-McCloud
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Fox-McCloud
ea8080e6c9
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
Crazylemon64
224f86bd64
Bibles can reveal runes now
2017-01-13 13:42:56 -08:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Fox-McCloud
a1b8205fdd
food
2016-11-29 08:45:46 -05:00
Aurorablade
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
...
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Markolie
a77b501ebf
Runtime fix
2016-10-27 15:03:07 +02:00
Markolie
4dcb46d295
More minor briefcase changes
2016-10-27 15:00:31 +02:00
Markolie
e9dc5b1b1f
Fix secure briefcases appearing empty
2016-10-27 14:56:58 +02:00
Aurorablade
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Markolie
79be3ca8cf
Fix up a number of ID checks
2016-10-23 15:49:02 +02:00
Aurorablade
e2ce799aa1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-08 22:21:48 -04:00
KasparoVy
ffc0083098
bottlefix
2016-09-18 01:06:47 -04:00
Krausus
d64bf46f12
Topic UID finishing touches
2016-09-08 13:07:14 -04:00
Aurorablade
2c104adaf3
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-01 00:43:50 -04:00
Fox McCloud
aa3600d96e
Merge pull request #5552 from jughu/Rapier-sheath-fix
...
Fixes sheath??
2016-08-26 21:21:43 -04:00
jughu
bb9f557401
Fixes sheath??
2016-08-26 22:48:06 +02:00
Aurorablade
b551345b73
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-24 20:49:20 -04:00
Crazylemon64
b633cf53af
Moves from log_debug to log_runtime for non-fatal abberant states
2016-08-23 17:03:52 -07:00
Fox-McCloud
43889a89d5
Ports Mining Shelters
2016-08-21 03:14:08 -04:00
Aurorablade
ec3d8c67a5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-19 01:01:19 -04:00
TheDZD
0a8b81ff7a
Merge pull request #5412 from FalseIncarnate/wololo
...
Wololo
2016-08-17 17:26:10 -04:00
TullyBurnalot
9634181318
Janitorial Quality of Life Update ( #5239 )
...
* Janitorial Quality of Life
- Trash Bags fit in satchels/bags/duffelbags
- Advanced Mops clean faster, can clean more
- Holosign Projectors can create more signs
- New Closet added, with janitorial stuff that was previously on the
ground
- Ghosts can no longer create dirt
- Dirt creation slowed down
- Janitorial Closet tidied up
* Removes redundant check
* Trash Bags become heavier with use
* Fixes Map Merge not being done
* Re-adds Box Refilling because I am an idiot
Missing parenthesis, not even ONCE
* Unblocks MULEbot docking area
* Adds broken bulb recycling
* Addresses Fox's/DZD's concerns
* Adds sanity checks for NODROP
2016-08-17 17:23:19 -04:00
Mieszko Jędrzejczak
a0959a742f
Why must thou abandon me, src?
2016-08-17 22:06:51 +02:00
Mieszko Jędrzejczak
cb33fdc79e
Goshdurn hoodies
2016-08-17 20:05:05 +02:00
Aurorablade
47dc3a3051
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-08-16 02:23:20 -04:00
monster860
19460ff4af
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
FalseIncarnate
8028695077
WOLOLO AEOOEO
2016-08-10 23:40:02 -04:00
Fox-McCloud
0b23e2a497
Fixes Bandolier Sprite
2016-08-10 18:57:35 -04:00
Fox-McCloud
0694a35da4
Formal Captain Update
2016-08-08 19:01:37 -04:00
Chakirski
6dca3112b3
The fact this is inconsistent hurts me.
2016-08-04 11:29:26 -05:00
TheDZD
bc98945c7a
Merge pull request #5177 from Fox-McCloud/medical-stack-rework
...
Trauma and Burn Kit Rework
2016-08-01 21:03:07 -04:00
TheDZD
8e9850d76a
Merge pull request #5222 from Crazylemon64/json_serialization2
...
Lets you convert people to text and back again
2016-08-01 20:55:08 -04:00
TheDZD
0cc2051f8a
Merge pull request #5251 from Fox-McCloud/fire-system
...
Implements Fire System
2016-08-01 19:39:50 -04:00
Fox McCloud
31ad2a84f2
Merge pull request #5132 from Kyep/atmos_grenades
...
Atmos Grenades (aka: how to kill people with atmos)
2016-07-31 22:40:03 -04:00
Crazylemon64
291fac97a0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2
2016-07-31 12:41:32 -07:00
Taylor Wood
869c13e493
Fixes exploding backpacks
2016-07-29 23:05:59 +01:00
Fox-McCloud
bde5755916
Implements Fire System
2016-07-29 13:24:09 -04:00
Kyep
4f01a05ae6
Changed Indentation
2016-07-28 22:03:55 -07:00
TheDZD
3061214620
Merge pull request #5205 from Fox-McCloud/librarian-qol
...
Librarian QoL---Bookbag
2016-07-28 15:12:46 -04:00
