cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,409 Commits 8 Branches 26 Tags
3b61ba850fbf26bb6392ec51bfe358797e6217e9
Commit Graph

6037 Commits

Author SHA1 Message Date
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Erthilo
9e17473f62 Uncomments books. Generifies mentions of tg or baystation. 2013-09-02 18:24:11 +01:00
Erthilo
9633dd9073 Alarm runtime fixes. 2013-09-02 17:45:38 +01:00
Erthilo
1e499d8994 Sleeper adjustments. Cannot inject over 20 units. 2013-09-02 17:45:24 +01:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
Erthilo
0008d649b0 Silent fix for megaphone. 2013-09-02 12:26:06 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
c872099e11 Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent. 2013-09-01 21:23:37 +01:00
Erthilo
235e09d2b9 Changed icon path for custom items due to compile times. 2013-09-01 13:24:38 +01:00
Erthilo
4f4fb38baf Changed pin to a 4 digit number. Game year standardised to this year +544. 2013-09-01 13:23:23 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00
Erthilo
b69c3b2ee4 Change hailer to hearable message. 2013-08-31 22:11:24 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
bc779a1eeb Indentation compile fix. 2013-08-31 17:49:07 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Mloc
2454d72233 Merge pull request #3620 from Segrain/master 
Bugfix.
 2013-08-31 08:07:26 -07:00
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Mloc
15b0fc24a3 Merge pull request #3611 from Erthilo/dev 
Medical tweaks, fixes, admin secrets
 2013-08-29 03:51:09 -07:00
Segrain
8d1fdd87b3 Typecheck fix. 2013-08-29 02:24:40 +03:00
Zuhayr
3762fcc4a8 Merge pull request #3610 from Mloc/master 
Space no longer freezes mobs.
 2013-08-28 10:48:57 -07:00
Mloc-Argent
9fed22c056 Space no longer freezes mobs. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-28 18:49:00 +01:00
Mloc
4d928843b1 Merge pull request #3609 from Zuhayr/dev 
Stuff from dev-freeze.
 2013-08-28 10:40:58 -07:00
Zuhayr
dabd0866a2 As above. 2013-08-28 23:34:12 -07:00
Zuhayr
c17347ef77 Added CubeJackal's security gear to the appropriate lockers. 2013-08-28 22:31:22 -07:00
Zuhayr
0dba5c14b4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-28 20:40:19 -07:00
Erthilo
0219ffe41e Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much. 2013-08-28 17:38:21 +01:00
Mloc
208ef684ad Merge pull request #3603 from Erthilo/master 
Fixes Thermite
 2013-08-28 06:06:54 -07:00
Mloc
489e037bcd Merge pull request #3599 from Erthilo/master 
Logs, lots and lots of logging, glass shards and suits, Prison button
 2013-08-28 05:37:01 -07:00
Erthilo
8ee601aa9a Fixes thermite runtimes. 2013-08-28 13:27:07 +01:00
Erthilo
3557e12943 Suits with shoes protect against glass shards. 2013-08-28 12:49:23 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Erthilo
1a0aaebfc1 "Fixes" law 0. 2013-08-28 01:55:02 +01:00
Philip
66071c81ba Update door_control.dm 
The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press.
 2013-08-27 16:38:07 -06:00
Erthilo
75f53ba5cd Reverts IA centcomm messaging due to the fax machine. 2013-08-27 22:12:04 +01:00
Erthilo
5f68a4c656 Misc formatting errors. 2013-08-27 22:10:47 +01:00
Erthilo
65fe9d429c Heads can now change the alert level. 2013-08-27 22:06:27 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Erthilo
1fd0522276 Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better. 2013-08-27 14:24:12 +01:00
Zuhayr
f77bbec4d5 Merge pull request #3592 from Kilakk/dev 
Fixes #3289, made the gibber be able to gib monkeys, aliens, and simple_animals
 2013-08-26 16:43:49 -07:00
Zuhayr
9e57181414 Merge pull request #3591 from Faerdan/dev 
Nano UI Improvements
 2013-08-26 16:42:44 -07:00
Kilakk
49ff40d028 Aggressive grip or better required to stuff things into the gibber 2013-08-26 19:21:00 -04:00
Kilakk
d2e1d9baa3 Fixes #3289, you can now gib monkeys, aliens, and simple_animals in the gibber 2013-08-26 19:03:11 -04:00
Mark Aherne (Faerdan)
fe993f8284 * Nano UIs now "work" with AI and Cyborgs. 
* Visibility updates (now uses line of sight).
* Added displayBar() template helper for displaying progress/health bars.
* Added new health bars to Nano UI Cryo.
* Added Eject Occupant to Nano UI Cryo.
* Nano now handles Topic for the src_object, allowing it to only allow interactions with UIs that have a "STATUS_INTERACTIVE" status/visibility.
 2013-08-26 23:39:52 +01:00
Segrain
9adba1516a Cyborg jobranks. 2013-08-25 21:28:07 +03:00
Zuhayr
8c58af4c65 Vox theft objectives should check lockers and other storage now. 2013-08-25 02:53:07 -07:00
Zuhayr
11c3de6da1 Got a vox shuttle check the wrong way around. 2013-08-25 02:15:28 -07:00
Zuhayr
97b0272e80 Added stealth engines to the Vox ship to allow the Exodus to hear that they are coming. 2013-08-24 21:24:41 -07:00