Commit Graph

11827 Commits

Author SHA1 Message Date
comma
8735254b87 Moved code from parent class with checks to subclasses.
Lots of copypaste code, but better that bloating that one main function even more IMHO.
As for bloat reason - readded advanced medithingies. Work same as lesser ones, but heal some damage directly instead, and have different messages/
2013-08-01 05:53:48 +04:00
Zuhayr
f50256eabb Work progresses on species datums. Mass-commit due to repo issues requiring a reset. 2013-07-31 11:50:56 -07:00
Segrain
c8381b6e90 Pipe painter addition. 2013-07-31 14:23:30 +03:00
Segrain
8021250804 Type mismatch fix. 2013-07-31 10:32:19 +03:00
Segrain
bd6c5f4b30 Removing internal cameras again. 2013-07-31 05:43:23 +03:00
Chinsky
36619656b8 Merge pull request #3395 from Zuhayr/feature
Podman rewrite, icons. Fixes from master. ERT stuff from Meyar.
2013-07-30 14:47:55 -07:00
Zuhayr
2644684a81 Proper runtime fix for ablative armour and tasers. 2013-07-31 07:30:57 -07:00
Zuhayr
76e18b0ebe Derp, compile fix. 2013-07-31 04:49:15 -07:00
Zuhayr
486f46d71e Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint. 2013-07-31 04:17:17 -07:00
Zuhayr
361ecb4e2b Merge resolution. 2013-07-30 17:33:18 -07:00
Kilakk
bd6b9cceeb Removed the tcomms server for the non-existant mining channel. 2013-07-30 17:39:02 -04:00
Kilakk
e9b8269e13 Adds colored department radio channels. 2013-07-30 17:38:34 -04:00
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Erthilo
d591c1ef75 Hotfix for EFTPOS and ATM machines not connecting to databases. 2013-07-30 20:26:08 +01:00
Erthilo
9bbf43407f Fixes Gravitational Catapult not detaching. 2013-07-30 20:06:37 +01:00
Segrain
24bc26fd13 Fix for table/computer cross-detection. 2013-07-30 19:13:42 +03:00
Segrain
578a020c8b Fix for #3392. 2013-07-30 12:15:12 +03:00
Kilakk
3f172dcd08 Changed ERT headsets to correctly show the Supply channel
* ERT headsets now (correctly) show the Supply channel rather than the two non-existant Cargo/Mining channels.
2013-07-29 22:31:47 -04:00
Chinsky
27c1bced7f Merge pull request #3385 from Zuhayr/master
Taser runtime fix.
2013-07-29 12:13:22 -07:00
Zuhayr
a39aff3471 Removed a very very redundant check in the ablative armour code. Thanks Segrain. 2013-07-29 12:51:20 -07:00
Zuhayr
5adc32cf8e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-29 12:15:23 -07:00
Zuhayr
b1ac1d58f9 Fixes #3383 2013-07-29 12:15:04 -07:00
Zuhayr
c361e6f4b7 Commented out debug string. 2013-07-29 16:55:03 -07:00
Zuhayr
6c53208115 Taser and examine fixes. 2013-07-29 16:50:37 -07:00
Zuhayr
2d45713d69 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-07-29 15:47:44 -07:00
Zuhayr
27d44c0e98 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-29 15:43:03 -07:00
meyar
1498c5748e Camera's got lost in the shuffle. 2013-07-29 04:34:28 -04:00
meyar
de0c032486 Turns two ERT files into one. Also fixes the ERT admin button being bork. 2013-07-29 03:45:49 -04:00
Segrain
ea320dca67 Conflict fix? 2013-07-29 08:15:54 +03:00
Segrain
da2786891a Fix for #3337. 2013-07-29 08:12:02 +03:00
Zuhayr
ea9078830a Merge pull request #3384 from SkyMarshal/airfixes
Fixes a bug with heat transfer.
2013-07-28 19:13:13 -07:00
SkyMarshal
cd72596249 Fixes a bug with heat transfer. 2013-07-28 19:11:05 -07:00
Zuhayr
af1f0108a2 Armalis pinning fix. 2013-07-29 07:06:55 -07:00
Zuhayr
08ff3df905 Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools. 2013-07-29 06:43:37 -07:00
Zuhayr
919dc1ae25 Added longer text to vox greeting message in Heist. 2013-07-29 06:39:43 -07:00
Zuhayr
8c3c26e2e8 Added cortical stacks for vox survival objective. 2013-07-29 06:36:55 -07:00
Zuhayr
c2e75f9ddb Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-07-29 06:05:00 -07:00
Segrain
fdce68fe66 Magboots fix. 2013-07-28 14:31:23 +03:00
Segrain
3c4b7507e9 Reactiveness 'quick'fix. 2013-07-28 13:02:10 +03:00
Kilakk
d7d84ff515 Added a deadchat toggle for all players.
* Both admins and regular players can toggle deadchat off
* Having deadchat on still requires you to be a ghost or an admin/mod to be able to /see/ deadchat
2013-07-27 22:54:30 -04:00
Zuhayr
e16d06d469 Merged setup.dm. 2013-07-28 08:46:10 -07:00
Zuhayr
168e334abd Added BE_RAIDER pref to player setup and adjusted vox min player counts away from local testing values. 2013-07-28 06:05:22 -07:00
Zuhayr
0c88896adf Adds a vox heist game mode. Fairly complex. 2013-07-28 05:18:04 -07:00
Zuhayr
a3ad055216 Merge pull request #3372 from Segrain/dev
Cameras update.
2013-07-27 15:42:04 -07:00
Segrain
47db87fcfe Cameras for strike teams. 2013-07-28 01:59:03 +03:00
Zuhayr
012401b380 Merge pull request #3371 from Kilakk/dev
Fixes #3368 - Removed the (empty) medkits from ERT backpacks
2013-07-27 15:40:47 -07:00
Segrain
6ab1011e8e Alarm cameras. 2013-07-28 01:25:55 +03:00
Segrain
914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Segrain
726cf4abb0 Robotic cameras again. 2013-07-28 00:39:25 +03:00
Segrain
93955846fa Robotic cameras. 2013-07-28 00:37:29 +03:00