cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,382 Commits 8 Branches 26 Tags
e8f052d0c97c7b9bed9a7d7240b1e4e01535f964
Commit Graph

4744 Commits

Author SHA1 Message Date
GauHelldragon
e7d66f06cd Farmbots! Adds new file farmbot.dm 
A new type of buildable AI bot that assists in hydroponics
Waters plants, hoes weeds and uses fertilizers
 2012-12-30 15:24:58 -08:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
Jim "Apples"
11427734c3 Merge pull request #2073 from CIB/bugfix 
Make setblock able to handle block index 0
 2012-12-16 09:23:25 -08:00
cib
8512bdd8d7 Make setblock able to handle block index 0 
It will simply do nothing. Fixes issue #2049
 2012-12-16 17:45:20 +01:00
Hawk-v3
9ed0e80acf Merge pull request #2058 from GauHelldragon/master 
Portable Generator Fix
 2012-12-16 05:55:56 -08:00
cib
0855c5d1af Fixes issue #2006 
Medical belt can now hold autoinjector.
 2012-12-16 04:04:43 +01:00
cib
7b8a33dc53 Fixed compile error regarding unclosed comment in events.dm 2012-12-16 03:39:45 +01:00
cib
62d88717ba Fixed a bug with rev objective checking. 
If a single alive, non-converted head left the station z-level, it'd be a victory for the revs.
 2012-12-16 00:18:50 +01:00
GauHelldragon
0db60b65c7 Portable generator Fix 
Portable generators properly drop their fuel when deconstructed
Portable generators need their cover open to be destructed now
Fixed a runtime error when building a portable generator with a 2s wire
 2012-12-12 02:49:29 -08:00
cib
c4e9afe0ae Fix issue #2048 
Disables random space ninja spawns.
 2012-12-11 11:57:22 +01:00
cib
173236acf0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-12-09 17:22:43 +04:00
cib
ecb12fb4db Merge branch 'master' of git://github.com/comma/Baystation12 2012-12-06 16:50:28 +04:00
Jim "Apples"
84bcc87e45 Merge pull request #2027 from SweeperM/master 
Fixes to lighting
 2012-12-03 03:09:02 -08:00
Chinsky
f0ac799952 Merge branch 'bandages' 2012-12-02 21:17:11 +04:00
cib
77943e04f3 Balance fix to random blob event. 
It now lasts 20 minutes instead of 5, and accordingly each blob
advancements happens every 30 seconds instead of every 7 seconds. This
means more time to respond to the blob, but overally the blob can still
be just as harmful if nothing is done about it.
 2012-12-02 13:58:57 +01:00
cib
bce8c4cfee Merge github.com:Baystation12/Baystation12 2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496 Better feedback messages and ability to target groin, hands and feet. 2012-12-02 16:30:24 +04:00
Chinsky
66d0f554f6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-02 00:14:03 +04:00
Chinsky
0a9b6f6bbe Removed armor suit from Captain's spawn gear 2012-12-02 00:03:30 +04:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 17:49:34 +10:00
Chinsky
85c2af3871 Started cleanup of medical stacks code. 
Removed silly way to get targeted organ.
Removed child organs being affected sometimes.
 2012-12-01 09:04:20 +04:00
SweeperM
b8a12b0b52 Fixes to lighting 
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
 2012-11-29 23:01:51 +00:00
cib
e11bab8ed7 Balancing emergency air tanks. 
- Reduced volume by 33%, since testing revealed they currently last nearly 10 minutes
- Made *everyone* spawn with emergency air tanks, as opposed to random jobs like lawyer etc.
 2012-11-28 02:32:04 +01:00
Hawk-v3
2cdbafa87e Merge pull request #2009 from CIB/master 
Fixes voting
 2012-11-24 14:06:58 -08:00
cib
5120d70e04 Fix the issue with time not counting down before game start. 2012-11-24 19:13:15 +01:00
Hawk-v3
74ed33360b Merge pull request #1975 from RavingManiac/master 
Wrapping paper fixes and improvements
 2012-11-23 17:52:52 -08:00
Hawk-v3
2197fd6cbc Merge pull request #2000 from Whitellama/master 
Map Fixes
 2012-11-23 17:52:27 -08:00
Whitellama
5f1552d35e Turned off space ninja spawning as a minievent 2012-11-23 14:59:18 -08:00
RavingManiac
f4fe11fc4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-24 01:26:19 +08:00
Chinsky
7150999fc6 Rolling pins now work not inly only in full moon at the odd day of week between 1 and 3 am if stars are right. 
Fixes issue #1980
 2012-11-21 22:29:46 +04:00
Chinsky
15abc757d3 Nullchecks. And one zero division. 2012-11-21 20:55:53 +04:00
RavingManiac
e31e117315 Package wrappers can now be put inside backpacks or other storage containers if the container is being held or worn. 2012-11-21 00:48:03 +08:00
SkyMarshal
0644ac9af0 Merge pull request #1974 from CIB/master 
Medical fixes and balancing
 2012-11-19 11:19:10 -08:00
cib
c5d35839ba Fixes issue #1959 
Crew transfer shuttles now force the mode to finish, even if the mode has other finish conditions.
 2012-11-19 12:24:14 +01:00
SkyMarshal
ae3cd42c76 Merge pull request #1973 from comma/master 
Runtimes
 2012-11-18 17:07:39 -08:00
Ispil
d6505fd064 Fix to Issue #1972. Humans now spawn with full SE length, as do monkeys. 2012-11-18 15:40:55 -07:00
cib
3a3f2ff4a1 Medical scanner additions. 
- Stationary scanners detect vira.
- Portable scanners detect internal bleeding.
 2012-11-18 16:38:29 +01:00
Chinsky
56c20b7fb3 Fixed couple of runtimes 2012-11-18 19:32:58 +04:00
cib
d0a542bc54 You now come out of cloning with slightly more damage. 2012-11-18 16:18:22 +01:00
Chinsky
684679cefb Fixes issue #1971 
Lasertag and practice beams won't explode tanks anymore.
 2012-11-18 11:24:17 +04:00
Ispil
ce0c2fc792 Fix to Issue #1961. Changes the Space Law book to link to the Baystation 12 wiki. Also changes the Engineering Textbook to link to the Baystation 12 wiki. 2012-11-17 12:16:02 -07:00
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/ZAS/FEA_system.dm
 2012-11-17 00:20:23 +04:00
Ater Ignis
8c5b8f8d50 final pass of merging with my branch 
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
 2012-11-16 18:54:43 +04:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing 
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
 2012-11-16 15:19:20 +04:00
Chinsky
750dc608fc Should prevent cloned Skrells and cats losing ears/tentacles after cloning. 2012-11-16 13:36:58 +04:00
Mloc
be9ab53289 Merge pull request #1951 from CIB/master 
Fixes
 2012-11-15 10:47:47 -08:00
cib
866a113494 Fixes for issue #1872 2012-11-15 18:40:24 +01:00
Mloc
7af340aa59 Merge pull request #1950 from comma/master 
Fixes, fixes.
 2012-11-15 08:49:09 -08:00
cib
0e11e0c041 Fix for issue #1947 
Fire alarms now clear from computers when cancelled.
 2012-11-15 17:48:13 +01:00
Mloc
a2bced69bc Merge pull request #1949 from CIB/master 
Fixes
 2012-11-15 08:45:45 -08:00